From 647742de618bd451da277d036c805174efa33f14 Mon Sep 17 00:00:00 2001 From: "cl349@arcadians.cl.cam.ac.uk" Date: Thu, 18 Nov 2004 14:56:25 +0000 Subject: [PATCH] bitkeeper revision 1.1159.176.4 (419cb819pVY6eBsMUAArh6ibXVHVbg) Only check console_use_vt during initialization. --- BitKeeper/etc/logging_ok | 1 + linux-2.6.9-xen-sparse/drivers/char/tty_io.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 9c08485b36..cbc3dd3c3e 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -10,6 +10,7 @@ br260@br260.wolfson.cam.ac.uk br260@labyrinth.cl.cam.ac.uk br260@laudney.cl.cam.ac.uk bren@anvil.research +cl349@arcadians.cl.cam.ac.uk cl349@freefall.cl.cam.ac.uk cl349@labyrinth.cl.cam.ac.uk cwc22@centipede.cl.cam.ac.uk diff --git a/linux-2.6.9-xen-sparse/drivers/char/tty_io.c b/linux-2.6.9-xen-sparse/drivers/char/tty_io.c index 32e28717f8..83dd5bac6d 100644 --- a/linux-2.6.9-xen-sparse/drivers/char/tty_io.c +++ b/linux-2.6.9-xen-sparse/drivers/char/tty_io.c @@ -1741,7 +1741,7 @@ retry_open: goto got_driver; } #ifdef CONFIG_VT - if (console_use_vt && device == MKDEV(TTY_MAJOR,0)) { + if (device == MKDEV(TTY_MAJOR,0)) { extern int fg_console; extern struct tty_driver *console_driver; driver = console_driver; @@ -1961,7 +1961,7 @@ static int tiocswinsz(struct tty_struct *tty, struct tty_struct *real_tty, if (!memcmp(&tmp_ws, &tty->winsize, sizeof(*arg))) return 0; #ifdef CONFIG_VT - if (console_use_vt && tty->driver->type == TTY_DRIVER_TYPE_CONSOLE) { + if (tty->driver->type == TTY_DRIVER_TYPE_CONSOLE) { unsigned int currcons = tty->index; int rc; -- 2.30.2